remove conflict mark

diff --git a/ChangeLog b/ChangeLog
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bee5091dab99d581afe674094e567e34e763d7ee..e7308c64634e5560986098bc3341215b99401a9c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001  Kristian Rietveld  <kristian@planet.nl>
        remove hack to strip off the bogus newline, since we killed the
        bogus newline; fixes #61779
 
->>>>>>> 1.2451
 2001-10-24  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't